merge trunk
authorK. Handa <handa@gnu.org>
Fri, 11 Oct 2013 01:28:32 +0000 (10:28 +0900)
committerK. Handa <handa@gnu.org>
Fri, 11 Oct 2013 01:28:32 +0000 (10:28 +0900)

Trivial merge